(x_default_font_parameter): Remove dead assignment.

diff --git a/src/ChangeLog b/src/ChangeLog
index c842a1c0306a9ce02160c7d641169f22af8595bd..ef97e097bf054b2b7c613aa2707544616295b373 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-11-17  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * xfns.c (x_default_font_parameter): Remove dead assignment.
+
        * lisp.h (Fbyteorder, init_font, Ffont_get_system_font): Declare.
 
 2009-11-17  Jan Djärv  <jan.h.d@swipnet.se>

diff --git a/src/xfns.c b/src/xfns.c
index 3d5a2a127d6ea9743b8fc4e6107cc95aa41bc2cb..2350fbfa9a486fe4393b67a3beaaf547c78db855 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3032,7 +3032,6 @@ x_default_font_parameter (f, parms)
   int got_from_gconf = 0;
   if (EQ (font_param, Qunbound))
     {
-      font_param = Qnil;
       font_param = Ffont_get_system_font();
       got_from_gconf = !NILP (font_param);
     }